Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zh,en: change sql to DDL for handle-error command #516

Merged
merged 3 commits into from
Dec 25, 2020
Merged

zh,en: change sql to DDL for handle-error command #516

merged 3 commits into from
Dec 25, 2020

Conversation

GMHDBJD
Copy link
Collaborator

@GMHDBJD GMHDBJD commented Dec 18, 2020

What is changed, added, or deleted? (Required)

Update handle-error command description for v2.0.1
Now handle-error only support ddl statement.

Which DM version(s) do your changes apply to? (Required)

  • master (the latest development version, including v3.0 changes)
  • v2.0 (TiDB DM 2.0 versions)
  • v1.0 (TiDB DM 1.0 versions)

What is the related PR or file link(s)?

pingcap/dm#1303

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

csuzhangxc
csuzhangxc reviewed Dec 18, 2020
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 18, 2020
@CharLotteiu CharLotteiu added needs-cherry-pick-release-2.0 Should cherry pick this PR to release-2.0 branch. status/PTAL This PR is ready for reviewing. translation/no-need The changes in this PR don't need to be translated. labels Dec 18, 2020
yikeke
yikeke approved these changes Dec 18, 2020
View reviewed changes
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Dec 18, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Dec 18, 2020
@yikeke
Copy link
Contributor

yikeke commented Dec 18, 2020

Should we merge this PR after v2.0.1 is released? @csuzhangxc @GMHDBJD

@csuzhangxc csuzhangxc mentioned this pull request Dec 18, 2020
Merged
7 tasks
@ti-srebot
Copy link
Contributor

@csuzhangxc, @yikeke, @ti-srebot, PTAL.

@ti-srebot
Copy link
Contributor

@csuzhangxc, @yikeke, PTAL.

@yikeke yikeke removed the status/PTAL This PR is ready for reviewing. label Dec 23, 2020
@CharLotteiu CharLotteiu merged commit 340e653 into pingcap:master Dec 25, 2020
ti-srebot pushed a commit to ti-srebot/docs-dm that referenced this pull request Dec 25, 2020
@GMHDBJD @ti-srebot
cherry pick pingcap#516 to release-2.0
69abaf2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 25, 2020
Merged
7 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-2.0 in PR #530

yikeke added a commit that referenced this pull request Dec 25, 2020
@ti-srebot @GMHDBJD
@CharLotteiu @yikeke
zh,en: change sql to DDL for handle-error command (#516) (#530)
14c4424 
* cherry pick #516 to release-2.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* resolve conflicts

* Apply suggestions from code review

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

Co-authored-by: GMHDBJD <35025882+GMHDBJD@users.noreply.github.com>
Co-authored-by: Charlotte Liu <37295236+CharLotteiu@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@csuzhangxc csuzhangxc csuzhangxc left review comments

@ti-srebot ti-srebot ti-srebot approved these changes

@yikeke yikeke yikeke approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-2.0 Should cherry pick this PR to release-2.0 branch. status/LGT2 Indicates that a PR has LGTM 2. translation/no-need The changes in this PR don't need to be translated.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@GMHDBJD @yikeke @ti-srebot @csuzhangxc @CharLotteiu